add variables and checks for specific versions of dependencies. Previously

2001-09-20  Havoc Pennington  <hp@pobox.com>

	* configure.in (PANGO_REQUIRED_VERSION)
	(ATK_REQUIRED_VERSION): add variables and checks for specific
	versions of dependencies. Previously we didn't verify the
	Pango or ATk versions.

2001-09-09  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextiter.c: fool with indentation
	(gtk_text_iter_in_range): add g_return_if_fail

diff --git a/ChangeLog b/ChangeLog
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 917f0c211e30605a3d4c341cb912cf0ca4f22c6c..556c7e68a7ac87b08cca1b46728b3974498153cd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2001-09-20  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in (PANGO_REQUIRED_VERSION)
+       (ATK_REQUIRED_VERSION): add variables and checks for specific 
+       versions of dependencies. Previously we didn't verify the 
+       Pango or ATk versions.
+
+2001-09-09  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextiter.c: fool with indentation
+       (gtk_text_iter_in_range): add g_return_if_fail
+
 Thu Sep 20 17:45:54 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix

diff --git a/configure.in b/configure.in
index ec143158ccef0dc9154b00f19f0afaa2c69db59d..4961c8402cb6fa8588aae32cc4174a1ef20f1c00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,11 @@ AC_SUBST(GDK_PIXBUF_MINOR)
 AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
 
+## Versions of dependencies
+GLIB_REQUIRED_VERSION=1.3.8
+PANGO_REQUIRED_VERSION=0.19
+ATK_REQUIRED_VERSION=0.4
+
 # For automake.
 VERSION=$GTK_VERSION
 PACKAGE=gtk+
@@ -192,6 +197,14 @@ changequote([,])dnl
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
+## Initial sanity check, done here so that users get told they 
+## have the wrong dependencies as early in the process as possible.
+## Later on we actually use the cflags/libs from separate pkg-config
+## calls. Oh, also the later pkg-config calls don't include 
+## the version requirements since those make the module lists 
+## annoying to construct
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION atk >= $ATK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION)
+
 # libtool option to control which symbols are exported
 # right now, symbols starting with _ are not exported
 LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
@@ -295,7 +308,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 # 
 
 GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
-GLIB_REQUIRED_VERSION=1.3.8
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 83b5e86b06ab52360d10c1ada7abcbfa59ecfa45..a745705aa66fe9240ae9f4f178ea910427391479 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -225,12 +225,6 @@ has the focus.
 
 @clist: The #GtkCList widget to check.
 
-<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
 <para>
 
@@ -1799,13 +1793,6 @@ arrow.
 @show_toggle_indicator: unused
 @show_submenu_indicator: whether to show the arrow or not
 
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@page_num: 
-
 <!-- ##### FUNCTION gtk_object_arg_get ##### -->
 <para>
 Private function to get an argument and argument info from an object.

diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 8c7596d839e68ebed5e2d8e8c59afc79110f2c31..4fa9b0e086fb1220754875455d76510d9c43b0f9 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -38,6 +38,13 @@ GtkContainer
 @pspec: 
 
 
+<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO gtk_container_border_width ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 6f9e96d0c87663da9835c7ea4d85e7ff4457943d..04ce877083e566de92bed98071871f05fc009d1e 100644 (file)
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -132,6 +132,15 @@ Deprecated compatibility macro.
 @Returns: 
 
 
+<!-- ##### MACRO gtk_notebook_set_page ##### -->
+<para>
+</para>
+
+<!-- # Unused Parameters # -->
+@notebook: 
+@page_num: 
+
+
 <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
 <para>
 </para>

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index bc43ec864211fd217b0aff16e1bd397bd0268540..d15e083fae6567f72f493b2809d22531de1b46d0 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -336,7 +336,7 @@ sized_icon_set_from_inline (const guchar *inline_data,
   set = gtk_icon_set_new ();
 
   source.pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL);
-
+  
   g_assert (source.pixbuf);
 
   gtk_icon_set_add_source (set, &source);

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 5a7fe85d26dca4c8288d65ed18769ad534eff4b0..7d6f51adadfe643f82b821472578133219eaf5f9 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -354,7 +354,7 @@ chars_changed (GtkTextBTree *tree)
 
 GtkTextBTree*
 _gtk_text_btree_new (GtkTextTagTable *table,
-                    GtkTextBuffer *buffer)
+                     GtkTextBuffer *buffer)
 {
   GtkTextBTree *tree;
   GtkTextBTreeNode *root_node;

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 2d5ecc8b5ab58fff041270fc7be34f2ff5466179..ddbd273b4cf902b6a8c9d6c8650a64e2c3150b7b 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -4744,9 +4744,8 @@ gtk_text_iter_compare (const GtkTextIter *lhs,
  * @start: start of range
  * @end: end of range
  * 
- * @start and @end must be in order, unlike most text buffer
- * functions, for efficiency reasons. The function returns %TRUE if
- * @iter falls in the range [@start, @end).
+ * Checks whether @iter falls in the range [@start, @end).
+ * @start and @end must be in ascending order.
  * 
  * Return value: %TRUE if @iter is in the range
  **/
@@ -4755,6 +4754,11 @@ gtk_text_iter_in_range (const GtkTextIter *iter,
                         const GtkTextIter *start,
                         const GtkTextIter *end)
 {
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (start != NULL, FALSE);
+  g_return_val_if_fail (end != NULL, FALSE);
+  g_return_val_if_fail (gtk_text_iter_compare (start, end) <= 0, FALSE);
+  
   return gtk_text_iter_compare (iter, start) >= 0 &&
     gtk_text_iter_compare (iter, end) < 0;
 }
@@ -4879,8 +4883,8 @@ _gtk_text_btree_get_iter_at_line      (GtkTextBTree   *tree,
 
 gboolean
 _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
-                                         GtkTextIter    *iter,
-                                         GtkTextTag     *tag)
+                                          GtkTextIter    *iter,
+                                          GtkTextTag     *tag)
 {
   GtkTextLine *line;
 
@@ -4907,8 +4911,8 @@ _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
 
 gboolean
 _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
-                                         GtkTextIter    *iter,
-                                         GtkTextTag     *tag)
+                                          GtkTextIter    *iter,
+                                          GtkTextTag     *tag)
 {
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (tree != NULL, FALSE);
@@ -4922,8 +4926,8 @@ _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
 
 gboolean
 _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
-                                      GtkTextIter *iter,
-                                      const gchar *mark_name)
+                                       GtkTextIter *iter,
+                                       const gchar *mark_name)
 {
   GtkTextMark *mark;
 
@@ -4944,8 +4948,8 @@ _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
 
 void
 _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
-                                 GtkTextIter *iter,
-                                 GtkTextMark *mark)
+                                  GtkTextIter *iter,
+                                  GtkTextMark *mark)
 {
   GtkTextLineSegment *seg;
 
@@ -4963,8 +4967,8 @@ _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
 
 void
 _gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree       *tree,
-                                         GtkTextIter        *iter,
-                                         GtkTextChildAnchor *anchor)
+                                          GtkTextIter        *iter,
+                                          GtkTextChildAnchor *anchor)
 {
   GtkTextLineSegment *seg;